Merge branch 'new-sysprof' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 21 Aug 2020 23:58:09 +0000 (23:58 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 21 Aug 2020 23:58:09 +0000 (23:58 +0000)
Port profiling to sysprof-collector api

See merge request GNOME/gtk!2457

1  2 
gdk/gdkdrawcontext.c
gdk/gdkframeclockidle.c
gsk/gl/gskglrenderer.c
gtk/gtkbuilderparser.c
gtk/gtkcssnode.c
gtk/gtkicontheme.c
gtk/gtkwidget.c
gtk/gtkwindow.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gtk/gtkwidget.c
Simple merge
diff --cc gtk/gtkwindow.c
Simple merge